[XEN][POWERPC] more -Wshadow issues with gcc4

Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --git a/xen/arch/powerpc/ofd_fixup.c b/xen/arch/powerpc/ofd_fixup.c
index 0da3387587327360aae8ad708a7462ebaf16b748..e23c2ccd9f7ec14955d406cad0c4ce57b278994b 100644 (file)
--- a/xen/arch/powerpc/ofd_fixup.c
+++ b/xen/arch/powerpc/ofd_fixup.c
@@ -24,6 +24,7 @@
 #include <xen/version.h>
 #include <public/xen.h>
 #include "of-devtree.h"
+#include "oftree.h"
 
 #undef RTAS
 
@@ -440,8 +441,7 @@ static ofdn_t ofd_xen_props(void *m, struct domain *d, start_info_t *si)
     }
     return n;
 }
-extern int ofd_dom0_fixup(
-    struct domain *d, ulong oftree, start_info_t *si, ulong dst);
+
 int ofd_dom0_fixup(struct domain *d, ulong mem, start_info_t *si, ulong eoload)
 {
     void *m;

diff --git a/xen/arch/powerpc/oftree.h b/xen/arch/powerpc/oftree.h
index 07fc3c04302cfc82407914a6c14aa50aa09198fc..4a96ceb3d0a2e83938edf7dbb759b7e69f6f8cc0 100644 (file)
--- a/xen/arch/powerpc/oftree.h
+++ b/xen/arch/powerpc/oftree.h
@@ -25,7 +25,7 @@ extern ulong oftree;
 extern ulong oftree_len;
 
 extern int ofd_dom0_fixup(
-    struct domain *d, ulong oftree, start_info_t *si, ulong dst);
+    struct domain *d, ulong mem, start_info_t *si, ulong dst);
 
 extern int firmware_image_start[0];
 extern int firmware_image_size[0];